From: Colin Walters <walters@verbum.org>
Date: Tue, 21 Mar 2017 15:27:19 +0000 (-0400)
Subject: Bump libglnx, port a few callers to new error API
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~39^2~39
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4cf210b128f390e2cdd149e40984acd239c37cd2;p=ostree.git

Bump libglnx, port a few callers to new error API

Testing out the waters here. I think we should roll this into any future code
cleanup reworking we do.

Closes: #747
Approved by: jlebon
---

diff --git a/libglnx b/libglnx
index 5309e363..602fdd93 160000
--- a/libglnx
+++ b/libglnx
@@ -1 +1 @@
-Subproject commit 5309e363aa30d2108a264ae35d8d870ee3e0c443
+Subproject commit 602fdd93cb7a339c6b5749eee73df926429a5ab8
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 4d7b431b..2130797e 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1798,13 +1798,9 @@ ostree_validate_structureof_objtype (guchar    objtype,
                                      GError   **error)
 {
   OstreeObjectType objtype_v = (OstreeObjectType) objtype;
-  if (objtype_v < OSTREE_OBJECT_TYPE_FILE 
+  if (objtype_v < OSTREE_OBJECT_TYPE_FILE
       || objtype_v > OSTREE_OBJECT_TYPE_COMMIT)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid object type '%u'", objtype);
-      return FALSE;
-    }
+    return glnx_throw (error, "Invalid object type '%u'", objtype);
   return TRUE;
 }
 
@@ -1837,11 +1833,7 @@ ostree_validate_structureof_checksum_string (const char *checksum,
   size_t len = strlen (checksum);
 
   if (len != OSTREE_SHA256_STRING_LEN)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid rev '%s'", checksum);
-      return FALSE;
-    }
+    return glnx_throw (error, "Invalid rev '%s'", checksum);
 
   for (i = 0; i < len; i++)
     {
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 34da969f..733db27b 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1831,10 +1831,7 @@ ostree_repo_create (OstreeRepo     *self,
   if (mkdir (repopath, 0755) != 0)
     {
       if (G_UNLIKELY (errno != EEXIST))
-        {
-          glnx_set_error_from_errno (error);
-          return FALSE;
-        }
+        return glnx_throw_errno (error);
     }
 
   if (!glnx_opendirat (AT_FDCWD, repopath, TRUE, &dfd, error))
@@ -1858,10 +1855,7 @@ ostree_repo_create (OstreeRepo     *self,
             return FALSE;
         }
       else
-        {
-          glnx_set_error_from_errno (error);
-          return FALSE;
-        }
+        return glnx_throw_errno (error);
     }
 
   for (guint i = 0; i < G_N_ELEMENTS (state_dirs); i++)
@@ -1870,10 +1864,7 @@ ostree_repo_create (OstreeRepo     *self,
       if (mkdirat (dfd, elt, 0755) == -1)
         {
           if (G_UNLIKELY (errno != EEXIST))
-            {
-              glnx_set_error_from_errno (error);
-              return FALSE;
-            }
+            return glnx_throw_errno (error);
         }
     }